remove leftover includes from autotools (#689)

* remove leftovers from autotools

we no longer have config.h, HAVE_CONFIG_H is always false.

* more config.h deletions (from jeeps)

diff --git a/defs.h b/defs.h
index 5eb339f5f5f01fc3275c0fbcfd31b07e8e2a8e14..3179feeaa75cbd626625c78d841ae6f2a9ee1903 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -29,9 +29,6 @@
 #include <optional>               // for optional
 #include <utility>                // for move
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
 #if HAVE_LIBZ
 #include <zlib.h>                 // doesn't really belong here, but is missing elsewhere.
 #elif !ZLIB_INHIBITED

diff --git a/jeeps/gpslibusb.cc b/jeeps/gpslibusb.cc
index def95886cd73c9a3a8b30d4518fab2fe302d497f..4207288313528d10c05cdac3e59289bd2cb48e27 100644 (file)
--- a/jeeps/gpslibusb.cc
+++ b/jeeps/gpslibusb.cc
@@ -24,9 +24,6 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#if HAVE_CONFIG_H
-#include "jeeps/config.h"
-#endif
 #if HAVE_LIBUSB_1_0
 #ifdef LIBUSB_H_INCLUDE
 // Warning: LIBUSB_H_INCLUDE necessarily includes bracket or double quote

diff --git a/jeeps/gpsusbstub.cc b/jeeps/gpsusbstub.cc
index 2f350b47932dfb512dfd289b2db3010d655d15c6..327482502346dc05dae76e8f85ff2a5182e0d9ee 100644 (file)
--- a/jeeps/gpsusbstub.cc
+++ b/jeeps/gpsusbstub.cc
@@ -20,10 +20,6 @@
  */
 
 
-#if HAVE_CONFIG_H
-#include "jeeps/config.h"
-#endif
-
 #include "defs.h"
 
 #if !HAVE_LIBUSB_1_0

diff --git a/zlib/README.gpsbabel b/zlib/README.gpsbabel
index 1f9e687a391fb561b3c3dad98d0dddd97d8d72a2..3451fe85944ca887502b5f721046729933aac6f9 100644 (file)
--- a/zlib/README.gpsbabel
+++ b/zlib/README.gpsbabel
@@ -1,7 +1,6 @@
 modified subset of zlib-1.2.11 from zlib.net.
 note that zlib 1.2.8 has a seek bug that will bite us.
 other changes after zlib 1.2.8 may be required as well.
-1. zconf.h is modified to include our config.h
-2. contrib/minizip/ioapi.c modifies a conditional adding __CYGWIN__
-3. contrib/minizip/ioapi.h modifies a conditional adding __FreeBSD__
+1. contrib/minizip/ioapi.c modifies a conditional adding __CYGWIN__
+2. contrib/minizip/ioapi.h modifies a conditional adding __FreeBSD__
 See the corresponding .patch files.

diff --git a/zlib/zconf.h b/zlib/zconf.h
index 393c12664983b2c20dc7aecf22dd2e1a1d157d3f..5e1d68a004e9744cb35f9d5a2fe94fd4dbcb7f76 100644 (file)
--- a/zlib/zconf.h
+++ b/zlib/zconf.h
@@ -8,12 +8,6 @@
 #ifndef ZCONF_H
 #define ZCONF_H
 
-/* Start GPSBabel local */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-/* end GPSBabel local */
-
 /*
  * If you *really* need a unique prefix for all types and library functions,
  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.

diff --git a/zlib/zconf.h.patch b/zlib/zconf.h.patch
deleted file mode 100644 (file)
index 2ac95aa..0000000
--- a/zlib/zconf.h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../zlib-1.2.8/zconf.h      2013-04-28 16:57:11.000000000 -0600
-+++ zlib/zconf.h       2017-11-11 09:05:50.666012999 -0700
-@@ -8,6 +8,12 @@
- #ifndef ZCONF_H
- #define ZCONF_H
- 
-+/* Start GPSBabel local */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+/* end GPSBabel local */
-+
- /*
-  * If you *really* need a unique prefix for all types and library functions,
-  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.